<!DOCTYPE html>
<html lang="en">
  <head>
    <meta charset="UTF-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Document</title>
  </head>
  <body>
    <p>这是一个首页的页面</p>
    <p>这是新增的首页功能----500hang</p>
<<<<<<< HEAD
    <p>12346</p>
    <p>12346</p>
    <p>12346</p>
    <p>12346</p>
=======
    <p>本蹦蹦</p>
    <p>songsong</p>
    <p>sad</p>
>>>>>>> article
  </body>
</html>
